8368984: Extra slashes in Cipher transformation leads to NSPE instead of NSAE #27615

valeriepeng · 2025-10-02T23:14:48Z

This PR updates the cipher transformation parsing and verification logic to be stricter and throws NoSuchAlgorithmException (NSAE) when additional slash(es) is found. With the existing parsing logic, the extra slash(es) is likely to end up in the last component, i.e. the padding scheme, and lead to NoSuchPaddingException (NSPE) from the underlying CipherSpi object.

Out of the supported cipher algorithms for all JDK providers, PBES2 cipher algorithms and RSA cipher with OAEP paddings may contain truncated SHA-512 in their transformations. This proposed fix would check for truncated SHA in both algorithm and padding schemes and throws NSAE if any extra slash is found.

Thanks in advance for the review~

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8368984: Extra slashes in Cipher transformation leads to NSPE instead of NSAE (Bug - P4)

Reviewers

Weijun Wang (@wangweij - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/27615/head:pull/27615
$ git checkout pull/27615

Update a local copy of the PR:
$ git checkout pull/27615
$ git pull https://git.openjdk.org/jdk.git pull/27615/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 27615

View PR using the GUI difftool:
$ git pr show -t 27615

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/27615.diff

Using Webrev

Link to Webrev Comment

… of NSAE

bridgekeeper · 2025-10-02T23:16:12Z

👋 Welcome back valeriep! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2025-10-02T23:16:46Z

@valeriepeng This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8368984: Extra slashes in Cipher transformation leads to NSPE instead of NSAE

Reviewed-by: weijun

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 123 new commits pushed to the master branch:

910bb68: 8349847: Support configuring individual lint categories as errors
6bfd018: 8366002: Beans.instantiate needs to describe the lookup procedure
7f070d3: 8369246: Use https in make/devkit scripts
... and 120 more: https://git.openjdk.org/jdk/compare/cedc0117ac36243cc240e8ab6adb3c78af4055fc...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

openjdk · 2025-10-02T23:17:23Z

@valeriepeng The following label will be automatically applied to this pull request:

security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2025-10-02T23:21:18Z

Webrevs

wangweij · 2025-10-03T02:37:46Z

src/java.base/share/classes/javax/crypto/Cipher.java

+            sha512Idx = transformation.indexOf(SHA512TRUNCATED, sha512SlashIdx +
+                    SHA512TRUNCATED.length());
+            sha512SlashIdx = (sha512Idx != -1 ? sha512Idx + 3 : -2);
+        }


The logic is quite complex. Can you create a dedicated method for it like indexOfRealSlashIn(String s)?

We can even call it on the mode part.

There are quite a few values being updated here, that's why I didn't make it into a method initially. Let me think about it more...

Both sha512Idx and sha512SlashIdx locally assigned, SHA512TRUNCATED is a constant, transformation is not mutated.

I did refactoring it using a record. If we apply the same method on mode as well, then the flow is simplified even though the mode should not contain truncated algorithms.

wangweij · 2025-10-07T18:35:56Z

src/java.base/share/classes/javax/crypto/Cipher.java


-    private static final String SHA512TRUNCATED = "SHA512/2";
+    // for special handling SHA-512/224, SHA-512/256, SHA512/224, SHA512/256
+    private static final String SHA512TRUNCATED = "512/2";


Is this constant still used?

Nope, I've removed it in the last commit.

valeriepeng · 2025-10-08T05:53:24Z

Thanks for the review~

valeriepeng · 2025-10-08T17:35:14Z

/integrate

openjdk · 2025-10-08T17:36:07Z

Going to push as commit ac73e68.
Since your change was applied there have been 137 commits pushed to the master branch:

79bcc7b: 8369257: PPC: compiler/whitebox/RelocateNMethodMultiplePaths.java fails with assertion
927aa3f: 8369178: G1: Use NMethodMarkingScope and ThreadsClaimTokenScope in G1RootProcessor
23fcbb0: 8365153: AArch64: Set JVM flags for Neoverse N3 and V3 cores
... and 134 more: https://git.openjdk.org/jdk/compare/cedc0117ac36243cc240e8ab6adb3c78af4055fc...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-10-08T17:36:17Z

@valeriepeng Pushed as commit ac73e68.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

8368984: Extra slashes in Cipher transformation leads to NSPE instead…

65c4ca6

… of NSAE

openjdk bot added the security [email protected] label Oct 2, 2025

openjdk bot added the rfr Pull request is ready for review label Oct 2, 2025

wangweij reviewed Oct 3, 2025

View reviewed changes

valeriepeng added 2 commits October 6, 2025 23:55

refactored using record to keep track of indices

5b29656

Updated based on Weijun's suggestion.

6fa2a15

wangweij reviewed Oct 7, 2025

View reviewed changes

removed unused variable

c94c056

wangweij approved these changes Oct 7, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Oct 7, 2025

openjdk bot added the integrated Pull request has been integrated label Oct 8, 2025

openjdk bot closed this Oct 8, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 8, 2025

valeriepeng deleted the JDK-8368984 branch October 8, 2025 17:38

8368984: Extra slashes in Cipher transformation leads to NSPE instead of NSAE #27615

8368984: Extra slashes in Cipher transformation leads to NSPE instead of NSAE #27615

Uh oh!

Conversation

valeriepeng commented Oct 2, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Oct 2, 2025

Uh oh!

openjdk bot commented Oct 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Oct 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mlbridge bot commented Oct 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

wangweij Oct 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

valeriepeng Oct 6, 2025

Choose a reason for hiding this comment

Uh oh!

wangweij Oct 6, 2025

Choose a reason for hiding this comment

Uh oh!

valeriepeng Oct 7, 2025

Choose a reason for hiding this comment

Uh oh!

wangweij Oct 7, 2025

Choose a reason for hiding this comment

Uh oh!

valeriepeng Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

valeriepeng commented Oct 8, 2025

Uh oh!

valeriepeng commented Oct 8, 2025

Uh oh!

openjdk bot commented Oct 8, 2025

Uh oh!

openjdk bot commented Oct 8, 2025

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

2 participants

valeriepeng commented Oct 2, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Oct 2, 2025 •

edited

Loading

openjdk bot commented Oct 2, 2025 •

edited

Loading

mlbridge bot commented Oct 2, 2025 •

edited

Loading

wangweij Oct 3, 2025 •

edited

Loading